bitkeeper revision 1.849 (407272f8v7jOensIw--qVa-usspUuQ)

Fix compiler warnings.

diff --git a/xen/drivers/message/fusion/mptscsih.c b/xen/drivers/message/fusion/mptscsih.c
index 46b57b04640c9a0a4f951fcf3c253e4df1c84249..49b0271efebb6bccfdb04f0f63c7574f044b0e56 100644 (file)
--- a/xen/drivers/message/fusion/mptscsih.c
+++ b/xen/drivers/message/fusion/mptscsih.c
@@ -2248,6 +2248,7 @@ struct info_str {
        int   pos;
 };
 
+#if 0 /* XEN */
 static void copy_mem_info(struct info_str *info, char *data, int len)
 {
        if (info->pos + len > info->length)
@@ -2282,6 +2283,7 @@ static int copy_info(struct info_str *info, char *fmt, ...)
        copy_mem_info(info, buf, len);
        return len;
 }
+#endif /* 0 (XEN) */
 
 /* SAE: For some reason off_t is not in any of the types.. */
 #ifndef off_t

diff --git a/xen/drivers/scsi/megaraid.c b/xen/drivers/scsi/megaraid.c
index 7ee589e1d3fd54032e32871707261d454c77ccdd..74a589f5b980ca9db1333c1d356748c7d326dc06 100644 (file)
--- a/xen/drivers/scsi/megaraid.c
+++ b/xen/drivers/scsi/megaraid.c
@@ -815,10 +815,10 @@ static struct file_operations megadev_fops = {
  */
 static struct mcontroller mcontroller[MAX_CONTROLLERS];
 
+#if XEN_KILLED
 /* The current driver version */
 static u32 driver_ver = 0x118C;
 
-#if XEN_KILLED
 /* major number used by the device for character interface */
 static int major;
 
@@ -4745,7 +4745,6 @@ static int megadev_ioctl_entry (struct inode *inode, struct file *filep,
        return ret;
 
 }
-#endif /* 0 (XEN) */
 
 static int megadev_ioctl (struct inode *inode, struct file *filep,
               unsigned int cmd, unsigned long arg)
@@ -5177,10 +5176,9 @@ static int megadev_ioctl (struct inode *inode, struct file *filep,
 static void
 megadev_ioctl_done(Scsi_Cmnd *sc)
 {
-#if XEN_KILLED
        up (&mimd_ioctl_sem);
-#endif
 }
+#endif /* 0 (XEN) */
 
 static mega_scb *
 megadev_doioctl (mega_host_config * megacfg, Scsi_Cmnd * sc)
@@ -5339,11 +5337,10 @@ mega_support_random_del(mega_host_config *this_hba)
        return 0; // no support for random deletions
 }
 
+#if 0 /* XEN */
 static int
 mega_del_logdrv(mega_host_config *this_hba, int logdrv)
 {
-  return -ENOSYS;
-#if XEN_KILLED_DELLOGDRV
        int             rval;
        IO_LOCK_T;
        DECLARE_WAIT_QUEUE_HEAD(wq);
@@ -5410,10 +5407,8 @@ mega_del_logdrv(mega_host_config *this_hba, int logdrv)
        IO_UNLOCK;
 
        return rval;
-#endif
 }
 
-#if XEN_KILLED_DELLOGDRV
 static int
 mega_do_del_logdrv(mega_host_config *this_hba, int logdrv)
 {
@@ -5448,7 +5443,7 @@ mega_do_del_logdrv(mega_host_config *this_hba, int logdrv)
 
        return rval;
 }
-#endif
+#endif /* 0 (XEN) */
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
 void *

diff --git a/xen/drivers/scsi/megaraid.h b/xen/drivers/scsi/megaraid.h
index aedc6388d49d11fce4f36506cb7bec7ae718a27c..48e7dd6a9f97eb56a7b125048cd33b0bcdccdb02 100644 (file)
--- a/xen/drivers/scsi/megaraid.h
+++ b/xen/drivers/scsi/megaraid.h
@@ -1012,14 +1012,14 @@ static void mega_build_kernel_sg (char *barea, ulong xfersize, mega_scb * pScb,
 static int megadev_open (struct inode *, struct file *);
 static int megadev_ioctl_entry (struct inode *, struct file *,
                                unsigned int, unsigned long);
-#endif
 static int megadev_ioctl (struct inode *, struct file *,
                          unsigned int, unsigned long);
+#endif
 static mega_scb *megadev_doioctl (mega_host_config *, Scsi_Cmnd *);
 #if 0
 static int megadev_close (struct inode *, struct file *);
-#endif
 static void megadev_ioctl_done (Scsi_Cmnd *);
+#endif
 static int mega_init_scb (mega_host_config *);
 static void enq_scb_freelist (mega_host_config *, mega_scb *,
                              int lock, int intr);
@@ -1041,7 +1041,7 @@ static int mega_partsize(Disk *, kdev_t, int *);
 static void mega_get_boot_drv(mega_host_config *);
 static int mega_get_ldrv_num(mega_host_config *, Scsi_Cmnd *, int);
 static int mega_support_random_del(mega_host_config *);
-static int mega_del_logdrv(mega_host_config *, int);
+/*static int mega_del_logdrv(mega_host_config *, int);*/
 /*static int mega_do_del_logdrv(mega_host_config *, int);*/
 
 #endif